From: John Wiegley <johnw@newartisans.com>
Date: Thu, 10 May 2001 03:29:06 +0000 (+0000)
Subject: (eshell-shuffle-files): Apply `directory-file-name' before calling
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~40383
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=df8fbf6ee8304fd38fa2b0cbe10d8d523ad62d4b;p=emacs.git

(eshell-shuffle-files): Apply `directory-file-name' before calling
`file-name-directory'.
---

diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index 1dfec1e7021..9b63accbbf0 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -360,10 +360,12 @@ Remove the DIRECTORY(ies), if they are empty.")
 			   (eq func 'rename-file)
 			   (= (nth 11 (eshell-file-attributes
 				       (file-name-directory
-					(expand-file-name source))))
+					(directory-file-name
+					 (expand-file-name source)))))
 			      (nth 11 (eshell-file-attributes
 				       (file-name-directory
-					(expand-file-name target))))))
+					(directory-file-name
+					 (expand-file-name target)))))))
 		      (apply 'eshell-funcalln func source target args)
 		  (unless (file-directory-p target)
 		    (if verbose